Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 Jan 2012 06:45:36 +0000 (22:45 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 Jan 2012 06:45:36 +0000 (22:45 -0800)

Trivial merge